bitkeeper revision 1.1495 (428e6e55_iTSnZRUSmqgYyK-Bql7Lg)
authoriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Fri, 20 May 2005 23:10:13 +0000 (23:10 +0000)
committeriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Fri, 20 May 2005 23:10:13 +0000 (23:10 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk

1  2 
xen/drivers/char/console.c

Simple merge